Migrate to tv plugin and other fixes