couple more random fixes