Fixed a few paint bugs