Bugfix and calibrate on-platform