Fix frameworks rebase build derps