These 3 are all sensible, should be pushed upstream.