Update to work against bpot/poseidon master