1617c50 fix rebase issue and missing return values

Authored and Committed by mikem a year ago
    fix rebase issue and missing return values
    
        
file modified
+5 -7