cosmetic changes to enable compilation with MS 1.1 compiler