Windows specific fixes