Fix some minor isues

Change-Id: I425807010ac182c3d9ea77b51a6bb781e26ac6a8
Signed-off-by: Brian McGillion <brian.mcgillion@intel.com>