Chronos fixes

Depends on #446, including until merged.