diff --git a/pythonbits/bb.py b/pythonbits/bb.py
index e3155f3..16d0fb5 100644
--- a/pythonbits/bb.py
+++ b/pythonbits/bb.py
@@ -17,6 +17,7 @@
 from unidecode import unidecode
 from requests.exceptions import HTTPError
 
+from . import flags
 from .config import config
 from .logging import log
 from .torrent import make_torrent
@@ -697,7 +698,7 @@ def _render_form_title(self):
             m=" / ".join(self['markers']))
 
     def _render_summary(self):
-        t = tvdb.TVDB()
+        t = tvdb.TVDB(interactive=('headless' not in flags))
         results = t.search(self['tv_specifier'], self['tvdb_id'])
         title_i18n = self.tvdb_title_i18n(results[0])
         summaries = []
@@ -1244,7 +1245,7 @@ class MusicSubmission(AudioSubmission):
     _cat_id = 'music'
     _form_type = 'Music'
 
-    @form_field('remaster_true', 'checkbox')
+    @form_field('remaster', 'checkbox')
     def _render_remaster(self):
         # todo user input function/module to reduce boilerplating
         return bool(
diff --git a/pythonbits/tvdb.py b/pythonbits/tvdb.py
index 505eb19..9820212 100644
--- a/pythonbits/tvdb.py
+++ b/pythonbits/tvdb.py
@@ -112,6 +112,7 @@ def __init__(self, interactive=True):
                                   actors=True, apikey=d(api_key))
 
     def search(self, tv_specifier, tvdb_id=None):
+        tvdb_id = tvdb_id if tvdb_id is None else int(tvdb_id)
         show = self.tvdb[tvdb_id or tv_specifier.title]
         season = show[tv_specifier.season]
         if tv_specifier.episode is not None: