Fix minor drawing issues