Bug fixes, tuple unify