Misc fixes; 9.0.16