Fixed a couple of warnings and reverted change to imports