Update to latest zpretzo local changes