add previous cocos fixes