diff --git a/scraper/lib/repository.js b/scraper/lib/repository.js
index d53b4b1..c6e748f 100644
--- a/scraper/lib/repository.js
+++ b/scraper/lib/repository.js
@@ -15,8 +15,8 @@ const Torrent = database.define('torrent',
     {
       infoHash: { type: Sequelize.STRING(64), primaryKey: true },
       provider: { type: Sequelize.STRING(32), allowNull: false },
-      torrentId: { type: Sequelize.STRING(128) },
-      title: { type: Sequelize.STRING(256), allowNull: false },
+      torrentId: { type: Sequelize.STRING(512) },
+      title: { type: Sequelize.STRING(512), allowNull: false },
       size: { type: Sequelize.BIGINT },
       type: { type: Sequelize.STRING(16), allowNull: false },
       uploadDate: { type: Sequelize.DATE, allowNull: false },
@@ -37,7 +37,7 @@ const File = database.define('file',
         onDelete: 'CASCADE'
       },
       fileIndex: { type: Sequelize.INTEGER },
-      title: { type: Sequelize.STRING(256), allowNull: false },
+      title: { type: Sequelize.STRING(512), allowNull: false },
       size: { type: Sequelize.BIGINT },
       imdbId: { type: Sequelize.STRING(32) },
       imdbSeason: { type: Sequelize.INTEGER },
@@ -67,7 +67,9 @@ function connect() {
 }
 
 function getProvider(provider) {
-  return Provider.findOrCreate({ where: { name: { [Op.eq]: provider.name } }, defaults: provider });
+  return Provider.findOrCreate({ where: { name: { [Op.eq]: provider.name } }, defaults: provider })
+      .then((result) => result[0])
+      .catch(() => provider);
 }
 
 function updateProvider(provider) {
diff --git a/scraper/lib/torrentFiles.js b/scraper/lib/torrentFiles.js
index 2f52cb5..807daa3 100644
--- a/scraper/lib/torrentFiles.js
+++ b/scraper/lib/torrentFiles.js
@@ -122,7 +122,7 @@ function parseSeriesFile(file, parsedTorrentName) {
     fileInfo.season = pathInfo.season;
   }
   // force episode to any found number if it was not parsed
-  if (!fileInfo.episodes) {
+  if (!fileInfo.episodes && !fileInfo.date) {
     const epMatcher = fileInfo.title.match(/(?<!movie\W*|film\W*)(?:^|\W)(\d{1,4})(?:a|b|v\d)?(?:\W|$)(?!movie|film)/i);
     fileInfo.episodes = epMatcher && [parseInt(epMatcher[1], 10)];
     fileInfo.episode = fileInfo.episodes && fileInfo.episodes[0];
diff --git a/scraper/manual/manual.js b/scraper/manual/manual.js
index 8501317..0b14219 100644
--- a/scraper/manual/manual.js
+++ b/scraper/manual/manual.js
@@ -83,6 +83,9 @@ async function reapplyEpisodeDecomposing(infoHash, includeSourceFiles = true) {
         if (fileIndexMap[file.fileIndex]) {
           const originalFile = fileIndexMap[file.fileIndex].shift();
           if (originalFile) {
+            if (!originalFile.imdbId) {
+              originalFile.imdbId = file.imdbId
+            }
             originalFile.imdbSeason = file.imdbSeason;
             originalFile.imdbEpisode = file.imdbEpisode;
             originalFile.kitsuId = file.kitsuId;
diff --git a/scraper/scrapers/1337x/1337x_scraper.js b/scraper/scrapers/1337x/1337x_scraper.js
index e0f7067..07162ab 100644
--- a/scraper/scrapers/1337x/1337x_scraper.js
+++ b/scraper/scrapers/1337x/1337x_scraper.js
@@ -61,6 +61,10 @@ async function processTorrentRecord(record) {
   if (!torrentFound || !TYPE_MAPPING[torrentFound.category]) {
     return createSkipTorrentEntry(record);
   }
+  if (isNaN(torrentFound.uploadDate)) {
+    console.warn(`Incorrect upload date for [${torrentFound.infoHash}] ${torrentFound.name}`);
+    return;
+  }
 
   const torrent = {
     infoHash: torrentFound.infoHash,