Importing fixes