fixed up some resolves