Correcting some old references that were causing issues.