Further small config fixes and some debug output