Further ondemand fixes