Added random fixes