#203 Fixes to config flow