fix issues with commands arguments