Fixed current Location Async and gas_type to integers