Add missing modules to import.
Small improvements