Fixing stupid stuff