Merge @dapicester changes for install/uninstall