Tweak some stuff