Changes to 'flex-guest'