Fixes for config edit