Minor fixes for windows build