Various tweaks / fixes