More windows compatibility changes.