Fix some draw stuff