Lint warnings
more Lint warnings.
Fixed recently introduced problem with multi-line editing.