Couple of small simplifications