Updates to accomodate Breakpoint 4.6.0