fixes for canvas