Improvements to frame buster code for #171