command fixups