More 'flex' tweaks