More fixups ...