Added a handful of patches for core and contrib.