Listing fixes