Fix compil & warning
Merge branch 'master' into NPCBot(test)
Fr