A few tweaks here and there