Rebase again? Both of those errors were fixed in the past few days.