Small cleanups

Cleaned up imports, and other small fixes.