Fixed some issues on import