couple random fixes