Fixed MSVC problems
Merge branch 'master' into updater
get rid of some warnings