Work with older HXCPP releases