Fix missing imports due to poor merging.