Fixes to external reference resolvers