Resolving integration issues