Fix some Z-level issues.
More z-level improvements