Various updates, including fix to Canvas copy