Add some tweaks from the PR