Work towards QBX FMM, QBX limit picking fixes