More commits as I try to fix fixRootTime