Fix some commands having two prefixes