Rework some of the navigator specs to be faster.