Clean up and fix configuration bug.