Fix msf-staff comments