Adds fix that missed the last commit
Resolved the friend declaration ambiguity

Figured out a way to solve it by finding this:
http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#125
Could have sworned I tried that. Oh well...