Miscellaneous modifications.