Begin fixing SymbolResolver
Symbol resolution fixes