Fixed entity and uploader plugin