More clearing fixups, hopefully