Couple of simplifications