Fix Windows version + minor syntax changes.