Some minor changes [iclass-related]