fix some errors after merge
Merge branch 'master' of tls01:/home/git/sw/NeutrinoRDP