Some "fixes" to get the Mashup sample to run.

Still results in a black screen.