tweak fixes to 5.0 upgrade