Attempt to fix broken commands.