Fix google maps loading, fix dev environment broken by 0.6.4