Add same label/radio/checkbox fixes from Market to base.