Add some minor tweaks