Lot of fixes in other commands.