Fixing a few rough issues with TMDB lookups