Fixed some timing issues with Round Trips