Fixing error and typos in previous commit