two additional issues uncovered by re-scan https://bugzilla.redhat.com/show_bug.cgi?id=690584 https://bugzilla.redhat.com/attachment.cgi?id=488272&action=edit https://bugzilla.redhat.com/attachment.cgi?id=488273&action=edit