Fixes to iris scripts