Made Ubuntu-Toch specific changes