random fixes 4