AVALANCHE: Fix some more MSVC warnings