Fix bad stuff