Fixes for xbox integration