more install/upgrade fixes