Extension and config fixes for 3.1