Command fixes.