Tweak annotation defaults to look better