Tweak some things