Fixes a few drawing bugs