Secman & Tools: various patches

subj