Fixed a few more GCC 4.6.3 errors with ambiguous ambiguity