Fixing unpublishing issues.