Player entity fixes