Added more support for force re-instal and re-run