Listing process fixes