Update submodules
Fix the resolvers.