Fixes to previous commit
Fixes to previous commit

faucetsdn/faucet,asmltd/faucet,mwutzke/faucet,anarkiwi/faucet,byllyfish/faucet,wackerly/faucet,gizmoguy/faucet,gwacter/faucet,shivarammysore/faucet,trungdtbk/faucet,asmltd/faucet,mwutzke/faucet,trentindav/faucet,gizmoguy/faucet,faucetsdn/faucet,REANNZ/faucet,Bairdo/faucet,Bairdo/faucet,asmltd/faucet,asmltd/faucet,asmltd/faucet,isomer/faucet,REANNZ/faucet,gwacter/faucet,trentindav/faucet,trungdtbk/faucet,anarkiwi/faucet,byllyfish/faucet,isomer/faucet,shivarammysore/faucet,wackerly/faucet