windows build tweak
Mac OS X build repair