am 90ed3e8d: fix a few problems with BitTube

* commit '90ed3e8d7883d9c80fb8bf11b1c593bd8b2b39d0':
  fix a few problems with BitTube