Additional simplifications