More fixes in commands