Fix compilation errors due to the rebase
f8341da
It's too complicated to make all the commits in that branch compile properly.
