Navigation Tweaks

Some tweaks to improve the speed of map building.