Change a few defaults and clean up.