Config system fixes