Cleanup so coverity issues

Change-Id: If0e012f546e0f78bb3fb2e930ca91ce3272a6a03
Signed-off-by: Brian McGillion <brian.mcgillion@intel.com>
Fix coverity warnings

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