Fixed install/upgrade issues