10.X fixes
fixes for the bugs