Fixed duplicating some timekeeping state variables