Fix bugs from my Canvas refactor