Fix what needs to be fixed