random fixes for stuff