General code cleanup - address E_ALL issues on installation.