Fixing messed stuff