Symbol table fixes