Fix compile errors by using Option[String]