Updated deprecated stuff.