Tim Bongers

Added two small fixes in IASS and Navigation that came up during testing (see commits)

Sorry about the delay, I totally lost track of this. The branch has now been rebased and the target set to 'release_9'.