Portability

Multiple fixes to be more C++11-standard compliant.