Miscellaneous updates (extraneous commit)