fixes to 5.0.9 for release