Fix more coverity findings

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