force option for skytools_upgrade and some fixes