Framework breakpoint fixes and other details