cmd fixes