Fixes related to multiple languages support