Minor improvements to drawing module