Clean up and minor fixes after testing in DE.