Fixing some drawing issues.