Minor tweaks / fixes