Some fixes in PlayerCapability