fixes to the code in MassOnTime backend