More fixes, but bugs remain.