*sz4: small fixes here and there