Various fixes for add_mac_framework_dependency_hack