Fix wrapping issues