[CocoaPods-0.29] Implement @alloy's fixes