Fix imports for scala style (import scala.Some)