Added fixes to make Player build