Better wrapping on long commands