Various simplifications