Fixes after pull request remarks