More stupid patches