Tiny fixes
Calibrations capturing was done!