57d01a Backport couple of fixes

Authored and Committed by Igor Gnatenko 8 years ago
    Backport couple of fixes
    
    Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
    
        
file modified
+25 -9