small_fixes: fixed DeprecationWarning
Merge branch 'small_fixes'