Bugfix & YouTube improvements (2.1.12.289)