Many breakpoint fixes