Error fixes with PlayerId