Fix Deprecate warnings