This should take care of bugs #5 and #6, though When adding this I found https://bugzilla.redhat.com/show_bug.cgi?id=1064040