More location initialization "polishing".