Few more fixes to use the new config dir structure