Minor Fixes to build with latest 10.2