Improvements to frame buster code for #171

See comments in #171