Updates from arco and fix for Google Maps