Minor tweaks everywhere