Fixing stupid things