fix up 5.0.1 merge compile errors