Fix configuration bugs.