Tweak some config to clarify a few things