Big cleanup of references.
Installer fixes