Fix slim 2.0 compatible warnings
Merge branch 'fix-slim-2.0-warnings'