Fix compile errors reported by HP aCC by fixing bugs introduced in 6dc57e2a
which do not cause trouble on clang or GCC.

Patch by Michael Osipov.