Update for ONE-4.0
a few fixes for 4.0
fix some stuff