Fixed more compile errors(should now work without -std:c++11)