Added setting lat and long where necessary #493