Fixing issues with no language selected for issue #831