further null programme_id fixes