Minor fixes install/upgrade scripts