fix arc issues and dependencies