Some minor simplifications