Resolve integration issues