calibrate.py fixups.