updates for bootstrap upgrade