Changes to improve support for TE923