Fix configuration bugs