Some more fixes to make google map to work
More fixes for google map