Imports and fixes