Bug fixes for MMSI work