(Xronos) Small maintenance changes