Fix Deprecated Objects