Bunch of random fixes.