Small tweaks in Commands.scala