Add support for stuff that's kind of broken.