Fix breakpoints and listing