Minor amends and tweaks