Fixes according to pull request comments