3180583 build fixes

Authored and Committed by stransky 3 years ago
    build fixes
    
        
file modified
+13 -27
file modified
+19 -15
file modified
+7 -4