some fixes for the location drawing