Data, small fixes to Jan's commands (I don't think he read what BaseCommand does).