A few tweaks