[FIX] VS warning removed
[FIX] more warnings removed