Updated fixes
Merge remote-tracking branch 'grog/mission' into grog-mission