ZL defintion fixes