Command fixes