even more random fixes