Internal references fixed