Drawing
Fixes