Oversight <-> trakt.tv fix

plus some other stuff