Apply some tweaks