a few more random fixes