More config tidying