More timestamp fixes for tasks