Mission System: More minor tweaks