Addressing the issues in https://github.com/mccun934/katello/pull/1