Small fixes for zad4