Some fixes for the location drawing