Canvas: Miscellaneous Bug Fixes