Fixes for players