Compilation issues

Fixed std::map compile errors and tried to correct vcxproj file.