Further fixes addcommanding