Small fixes for sharesix resolver.