some random fixes