A bunch of random fixes!