Pulled out common settings and fixed docs resolvers