Xcode targets fixes