Two deprecated things corrected, one with the wrong deprecation message.