Fix problems mentioned in push-request 717

Signed-off-by: Yanbing Du <ydu@redhat.com>