Some fixes regarding imports.