Fixed some minor timing bugs uncovered by the integration tests