More timestamp fixes