small import errors

two imports from recent merges that needed to be changed, but were missed.  one breaks many things, the other is simply semantically wrong.

Will merge straightaway.