fixes for visual studio