A couple of random fixes