Bug fixes for imports