General fixes. Naru - Fixes to Command.