Fix moar outstanding issues
Merge remote-tracking branch 'origin/pr/2' into ms08_067_check