Fixing silly stuff