Fixed up another couple of translation units and fixed some introduced bugs.