Lots of little tweaks to unbreak.