A few listing fixes