More fixups