Build tweaks for Windows
Fixed ToolBar code to conform to Win32 change