Shared breakpoints and other small changes