Minor changes to scala DSL