Some tweaks ...