More C++11 fixes

Can't make boost zip iterator etc. play nice with C++11 tuple, we may
have to reimplement the iterators