[NC/NR] Miscellaneous additions