Subtle config improvments