windows related fixes