Fixes as required on the pull request