Woops, forgot to stage the merge fixes.