Small fixes for latest Microsoft compiler