Apprently I missed a few timestamp fixes