Miscellaneous updates. [2]