Make a few tweaks