Windows Build fixes