Fix up compilation bugs left after merge.