Misc changes. Blocked opennsh 6.2_p1