Fixing problems found in review