Fixed for build 2.11
Fixed deprecations
Bumped for 0.96.0