Fix couple of warnings on log
Merge branch 'scabrero/fix-warnings'