Lots of random fixes.