Flex improvements.