Further updates for ISIS-833 (modules).