Minor fixes from the PR