DayOff: Moonriver incident: Minor fixes

Minor fixes