More windows compatibility changes