Fixing defects found in the review