rhbz1002792 and rhbz1056308

- https://bugzilla.redhat.com/show_bug.cgi?id=1002792
- https://bugzilla.redhat.com/show_bug.cgi?id=1056308