more apollo/poseidon fixes