Tweak and fix