Fix some more wrapping issues.

Haha, get it?  'More' wrapping issues?