Resolves bz956021 (f18), bz956026 (f17), bz956031 (f19) Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>