Ustream fixes