MODE-2339: Fix for several errors regarding configuration handling