r5956: more compile warngin fixes from the Mr. Mader