Fixing some warnings using VS