Fix regular imports