Fixed issues identified by Aaron, various labs

Signed-off-by: Vinny Valdez <vvaldez@redhat.com>