02039d0 Fix problems found using gcc-7

Authored and Committed by sdgathman 7 years ago
    Fix problems found using gcc-7
    
        
file added
+22
file modified
+5 -4
file added
+17
file modified
+10 -1
file modified
+30 -11