Many random fixes