more random fixes