Updates to match changes in ilwis