Fix symbol lookups on 2.2