New commands fixes