Some drawing fixes