Minor type improvements in legacy protocol code