Fix issues  with Windows 7.