Removed "Mixed Platform" from solution (and a build fix).

Guys, just FYI. I'm merging this straight in. @ikeough @pboyer @lukechurch.