Canvas fixes merged from pongad, partial merge from dustsnow