Fix line-length problems