Sonar fixes in FlowControlNode