Fixed some issues in wrapping formatting.