More exposed modules.
Redundant import.
Fix warnings.