Imports and compilation problem fixes