Many compilibility changes

Getting more and more ready for compiling with 6L02. But we're not there
yet. We're not even close, I think.