Update to latest
Fix the build because of Xamarin reference errors