added fixes for windows build