Changes as discussed in the PR comments