Small random fixes