Tweak some defaults