Some tweaks to try and help the smaller navigation requests accomplish a little more work