Retirement protocol updates and fixes

Signed-off-by: Vidhoon Viswanathan <vidhoon@cs.utexas.edu>