Able to compile on XS 4.3.4.

Same as Dons changes but for 4.3.4, current alpha channel version.