Various improvements to support fbp