Some more tweaks / fixes