A couple small tweaks to make another scenario stop failing.