Canvas bug fixes