Final fixes for zad18 and zad20