Fix up imports properly