Some more simplifications