Poseidon and apollo fixes