Fixed broken deprecated fixes.