Minor fixes to zad8