Fixes to old windows build method.