Bugfix and language fix