A few tweaks and adjustments