Minor fixes in DrawingComponent