Bug 950677 - Fix compile errors on Windows/FFOS builds

The errors were discovered when running on the try server.