random fixes for totest