Minor QBX tweaks