Fixing configuration bugs.