Player fixes
merge