Syntax fixes for windows