Small fixes.

Change-Id: Ia9a324500f96118578199d5ced2d01bd0393cbfa
Signed-off-by: joe-alewine <Joe.Alewine@ibm.com>