Several Multi-Z Fixes
Fix.