Mode cmd fixes