moar random fixes