Fixes to drawing