Fix two minor issues for continuous collection in the stop method.