More 1.6.2 backports

-code cleanup/fixes
-minor turbine work