More updates from Scala version