Added back two imports inadvertantly removed in the last commit.