Minor time improvements