Integer for airports, addresses fixed (again)