Minor additional tweaks