Various small Tv4 fixes