Minor changes to clean up config a little.