Bug #8152] Fixed lint warnings