Patches for update checkNT -mostly string fixes [sf#1107259] [#384]