Addressed some errors spotted by reviewers