Small changes related to configs