A bunch of patches that might become their own package