Lotsa patches that took forever to figure out.