Resolved compatibility issues with CocoonJS