Fixes for ondemand clusters