Fix to avoid warnings
Merge branch 'hotfix/warnings'