Fixed defects found in review