Updates to for 10.2 compatibility and testing

Updates to for 10.2 compatibility and testing