more fixups.