Win7 fixes