Another few tweaks