BIP-135 pod refactor fixes