plus some fix here and there Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Signed-off-by: Haiyan Meng <hmeng@redhat.com>