Updates to get framework working again after alterations.