Fix post-reformat errors preventing windows compilation