Fixes per comment on Github
Fixes per comment on Github

stuartf/Hilary,jfederico/Hilary,Coenego/Hilary,Orodan/Hilary,nicolaasmatthijs/Hilary,nicolaasmatthijs/Hilary,mrvisser/Hilary,simong/Hilary,ExC0d3/Hilary,ExC0d3/Hilary,Orodan/Hilary,simong/Hilary,timdegroote/Hilary,timdegroote/Hilary,jfederico/Hilary,mrvisser/Hilary,stuartf/Hilary