BIP-135 Pod refactor fixes