Clean up some imports.
Eliminate a couple of compilation errors from Patches.
Merge pull request #95 from pjonsson/misc-fixes

Minor polish