Minor ZLUX issues fixed