Allow switching to native player
and fix it