more flex vendor fixes