Fix some wrapping issues