Symbol and SymbolTable fixes