Fixes based on pull request feedback
Fixes based on pull request feedback

grimradical/puppetdb,ajroetker/puppetdb,puppetlabs/puppetdb,senior/puppetdb,johnduarte/puppetdb,ajroetker/puppetdb,shrug/puppetdb,grimradical/puppetdb,senior/puppetdb,rbrw/puppetdb,jantman/puppetdb,wkalt/puppetdb,kbrezina/puppetdb,waynr/puppetdb,puppetlabs/puppetdb,puppetlabs/puppetdb,highb/puppetdb,highb/puppetdb,kbrezina/puppetdb,johnduarte/puppetdb,waynr/puppetdb,mullr/puppetdb,johnduarte/puppetdb,puppetlabs/puppetdb,mullr/puppetdb,highb/puppetdb,shrug/puppetdb,wkalt/puppetdb,kbrezina/puppetdb,waynr/puppetdb,kbrezina/puppetdb,senior/puppetdb,cprice404/puppetdb,mullr/puppetdb,wkalt/puppetdb,grimradical/puppetdb,ajroetker/puppetdb,puppetlabs/puppetdb,kbarber/puppetdb,wkalt/puppetdb,shrug/puppetdb,cprice404/puppetdb,mullr/puppetdb,kbarber/puppetdb,rbrw/puppetdb,highb/puppetdb,ajroetker/puppetdb,kbarber/puppetdb,rbrw/puppetdb,kbarber/puppetdb,rbrw/puppetdb,senior/puppetdb,jantman/puppetdb,mullr/puppetdb,rbrw/puppetdb,shrug/puppetdb,waynr/puppetdb,grimradical/puppetdb,cprice404/puppetdb,jantman/puppetdb,johnduarte/puppetdb