Drawing fixes