More changes from EZP-22930