Small modifications of mark as complete