Fixing some stuff now so much has changed