Fixed CommandBase and OI to get rid of errors