Fix config dependency order