Fixed a few drawing/filling bugs