Fixes based on the PR comments