Fix command validation