Add some tweaks