Code fixes

Various code fixes, mostly discovered by MSVC code static analyzer .
Look at the condition more carefully...