Minor updates in support of some other module projects.