Fixed Ivy issues.
Merge branch 'working' into feature-extraction