[Reviewer: Andy] Various Chronos bugfixes