Fix for recent Cocos API changes/renames