Linux APM Toolbar broken, Windows build broken

Build/Tested on all platforms