Acceptor/Proposer fixes