Add a few tweaks