Fixes for consistency and new z