diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp
index 0b54cb54..330bc55e 100644
--- a/src/core/common/avatarmanager.cpp
+++ b/src/core/common/avatarmanager.cpp
@@ -166,7 +166,7 @@ AvatarManager::ChunkReadAvatarFile(boost::shared_ptr<AvatarFileState> fileState,
 		try {
 			if (!fileState->inputStream.fail() && !fileState->inputStream.eof()) {
 				fileState->inputStream.read((char *)data, chunkSize);
-				retVal = fileState->inputStream.gcount();
+				retVal = static_cast<unsigned>(fileState->inputStream.gcount());
 			}
 		} catch (...) {
 			LOG_ERROR("Exception caught when trying to read avatar.");
diff --git a/src/engine/local_engine/localboard.cpp b/src/engine/local_engine/localboard.cpp
index 66ea3da9..2767a94b 100755
--- a/src/engine/local_engine/localboard.cpp
+++ b/src/engine/local_engine/localboard.cpp
@@ -355,10 +355,10 @@ void LocalBoard::determinePlayerNeedToShowCards()
 				//                break;
 				//            }
 				//        }
-				for(level_it = level.begin(); level_it != level.end(); level_it++) {
+				for(level_it = level.begin(); level_it != level.end(); ++level_it) {
 					if((*it_c)->getMyCardsValueInt() > (*level_it)[0]) {
 						next_level_it = level_it;
-						next_level_it++;
+						++next_level_it;
 						if(next_level_it == level.end()) {
 							playerNeedToShowCards.push_back((*it_c)->getMyUniqueID());
 							level_tmp = new int[2];
@@ -370,7 +370,7 @@ void LocalBoard::determinePlayerNeedToShowCards()
 					} else {
 						if((*it_c)->getMyCardsValueInt() == (*level_it)[0]) {
 							next_level_it = level_it;
-							next_level_it++;
+							++next_level_it;
 //
 //                                for(level_it_tmp = level.begin(); level_it_tmp != level.end(); level_it_tmp++) {
 //                                    cout << (*level_it_tmp)[0] << "," << (*level_it_tmp)[1] << endl;