More fixes for windows config header