Fix a missing name and some unused imports

My editor highlights these automatically, so it was easy to spot these. There are some more than I'm not sure how to fix.