Make sure we are on a listing.
A few tweaks.