Small style changes on Windows (should test on Mac).