Fix unlisted issues