fixes for canvas demo