Some more fixes missed by not bootstrapping myself