Paint editor fixes