Few more changes to configs