Scala minor changes