Fixed more drawing bugs