Fixed NodeInfo debacle.

Other compilation fixes.
Merge branch 'integration' of github.com:RickEyre/mozilla-central into integration