0b79915
fix compiler warnings in ticket 374 code (cherry picked from commit 1f775d7339cdabde70e73ce0be2e4432b16ba1a3)