more canvas fixes