Make Calibrate task a little safer.
Update xpcc submodule.