Same as Dons changes but for 4.3.4.
Merge pull request #415 from rojepp/compile_on_xs4_3_4

Able to compile on XS 4.3.4.