More tweaks, fix release bld on x64 windows