Improve Unstoppable Fox's build and Super Sentry's BHS logic