Updates to fix Google Map issue.