Fix some more defects.

Done