Draw related tweaks

Scratched crews