Some changes to ondemand