Fixed a few warnings and imports.