Fix scala style import issue (import scala.Some)