Bugs fixed prompted by TM/C.