More accept/reject/confirm fixes