Mode7 Demo: Fixes for new APIs