Improvements to the NavSample sample.