Fix retraction/Z/lift problems after recent changes