BFQ: Fixes and adds