More player fixes.