more fixes for warnings reported by MSVC