Some fixes (mostly related to new Scala Style Guide).