Changes required to build for visual studio