fixed Deprecation Warnings