Fix sequence/timestamp issues for real this time