Some fixes to run MDT calibration

Hi,

this MR does some cleanup needed to run the MDT calibration framework on calibration stream data in master.

Best, Nico