We took the "Aerobus" from the airport directly to Rossio Square, where we were staying (Apparently, later that year, a subway extension to the airport opened) We then walked down to Commerce Square, on the waterfront.