added fixes after testing on XP and Win7 images