Fixing deprecations from RC1