Fixes for getting demo to run