Fixes to config sync