Various config fixes