More stupid tweaks