Initial Scala commit
Minor Scala related updates