Fix unmarshaling to Location struct