Small fixes for zaj4