Fixing Base_Command and xinga