Configurability bugfixes