Fixed up config building