Adjustments to make it work with ANE build