timestamp fixes