Some fixes to config API