more timestamp fixes