Minor changes to ensure everything works in a multi-module configuration.