Fix issues reported by Sonar
Fix issues reported by Sonar

nla/bamboo,greg-pendlebury/bamboo,greg-pendlebury/bamboo,greg-pendlebury/bamboo,greg-pendlebury/bamboo,greg-pendlebury/bamboo,nla/bamboo,nla/bamboo,nla/bamboo