some more random fixes