Summary: A number of fixes for Zero and Shark.
Reviewed-by: twisti
Contributed-by: NGary Benson <gbenson@redhat.com>