Fix some configuration issues.