Fix configuration registration.
Also improve conf registration for advanced conf.