Updates following MO API cleanupwq