Fixing some issues in the add command.