Additional fixes for ling feature integration.