A couple of harmless patches that we were carrying down on Endless, but may be suitable for upstream.