[BUGFIX] Fix language issues