Changes to Installation of optional components, and upgrade scripts