Abadi: Issues to be resolved within final agreement