minor changes to prevent occasional errors during traj scans
Chris's tidy up
Merge remote-tracking branch 'origin/8.30.i18.sept' into 8.30