Merge of pongad's changes - canvas fixes