Some fix on cmd queue