Fixes issues in monolingual setups