Fixed ore metadata drop issues