Fixing Nintendo Switch issues