Cont of #3171, Reusing pattern canvas fixes