Commands fixes