Fix Deprecation warnings

Merged Trung Nguyen requested to merge fix_warnings into master

Merge request reports