Fixed Aviary references that remained