Fix references to symbols outside package