[FTW] Resolve crashes found while running canvas tests