More additions from Flexbox fixes.