Fix latest marketplace warnings