A few tweaks...