Just a few tweaks