Windows fixes for style