[PRE-COMP] Miscellaneous updates.