More fixes with references that are now outdated.