Bug fixes.

Signed-off-by: Jameson Williams <jameson.h.williams@intel.com>