Tweak some small stuff