Small fixes in calibration and background image rendering