Couple of random improvements