Fixing some bugs with ondemand and live progress ui