Camera: small improvements to calibration