Added a few missing imports.