This a few minor changes down from upstream since the last sync.

Signed-off-by: Simon Glass <sjg@chromium.org>