Small changes off the back of the PR