Fixes for canvas update