More invalid references fixed.