Fixed frameworks_base patches