Nintendo-related fixes and changes

This won't conflict with the Alcatel changes. I was able to merge the two branches locally without any problem.