Fixing weird things