Fix issues raised in code review
Fix issues raised in code review

paladin74/weave,BWITS/weave,BWITS/weave,beni55/weave,ycaihua/weave,19hz/weave,2opremio/weave,BWITS/weave,philipz/weave,paladin74/weave,beni55/weave,achanda/weave,awh/weave,rade/weave,BWITS/weave,dpw/weave,aaam/weave,2opremio/weave,paulbellamy/weave,cgvarela/weave,paladin74/weave,bboreham/weave,inercia/weave,philipz/weave,paulbellamy/weave,19hz/weave,Lawouach/weave,Lawouach/weave,OnePaaS/weave,aaam/weave,philipz/weave,Lawouach/weave,dpw/weave,narry/weave,OnePaaS/weave,ycaihua/weave,n054/weave,inercia/weave,BWITS/weave,dpw/weave,kidaa/weave,bboreham/weave,cgvarela/weave,squaremo/weave,cgvarela/weave,awh/weave,19hz/weave,squaremo/weave,paulbellamy/weave,errordeveloper/weave,achanda/weave,kidaa/weave,aaam/weave,aaam/weave,kidaa/weave,n054/weave,awanke/weave,squaremo/weave,2opremio/weave,tomwilkie/weave,inercia/weave,2opremio/weave,squaremo/weave,bboreham/weave,2opremio/weave,awanke/weave,n054/weave,bboreham/weave,squaremo/weave,tomwilkie/weave,errordeveloper/weave,inercia/weave,paladin74/weave,achanda/weave,dpw/weave,beni55/weave,paulbellamy/weave,beni55/weave,narry/weave,beni55/weave,errordeveloper/weave,n054/weave,OnePaaS/weave,awanke/weave,rade/weave,ycaihua/weave,errordeveloper/weave,n054/weave,weaveworks/weave,cgvarela/weave,weaveworks/weave,achanda/weave,19hz/weave,narry/weave,kidaa/weave,errordeveloper/weave,achanda/weave,philipz/weave,OnePaaS/weave,ycaihua/weave,Lawouach/weave,awh/weave,tomwilkie/weave,awanke/weave,rade/weave,ycaihua/weave,rade/weave,awh/weave,narry/weave,narry/weave,inercia/weave,aaam/weave,weaveworks/weave,tomwilkie/weave,cgvarela/weave,awh/weave,philipz/weave,dpw/weave,paladin74/weave,tomwilkie/weave,kidaa/weave,bboreham/weave,weaveworks/weave,OnePaaS/weave,rade/weave,awanke/weave