Fixed resolvers.
Merge branch 'test' into dtrace