Fix leftover stuff