Fixed deprecations. Closes #1.