Integrated ExSwift, fix localIdentifier issues