diff --git a/OpenVPN Adapter/Umbrella-Header.h b/OpenVPN Adapter/Umbrella-Header.h
index afdc6f7..eca3f8d 100644
--- a/OpenVPN Adapter/Umbrella-Header.h	
+++ b/OpenVPN Adapter/Umbrella-Header.h	
@@ -5,11 +5,8 @@
 //  Created by Sergey Abramchuk on 09.03.17.
 //
 //
-#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
-@import UIKit;
-#else
-@import AppKit;
-#endif
+
+@import Foundation;
 
 //! Project version number for OpenVPNAdapter.
 FOUNDATION_EXPORT double OpenVPNAdapterVersionNumber;
diff --git a/OpenVPN Client.xcodeproj/project.pbxproj b/OpenVPN Client.xcodeproj/project.pbxproj
index 6b59adc..3ef6065 100644
--- a/OpenVPN Client.xcodeproj/project.pbxproj	
+++ b/OpenVPN Client.xcodeproj/project.pbxproj	
@@ -991,7 +991,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				INFOPLIST_FILE = "OpenVPN Tunnel Provider/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/OpenVPN iOS Tunnel Provider/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1050,7 +1050,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				INFOPLIST_FILE = "OpenVPN Tunnel Provider/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/OpenVPN iOS Tunnel Provider/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "me.ss-abramchuk.openvpn-ios-client.tunnel-provider";
@@ -1188,7 +1188,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 2TWXCGG7R3;
@@ -1211,7 +1210,6 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
-				PRODUCT_BUNDLE_IDENTIFIER = "me.ss-abramchuk.OpenVPN-Adapter-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -1242,7 +1240,6 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 2TWXCGG7R3;
@@ -1259,7 +1256,6 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = "me.ss-abramchuk.OpenVPN-Adapter-Tests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 3.0;