Player and Core fix