A couple deprecations, and method name / arg order fixes