Fixes after testing on xbox one