Fix problems caused by last commit. However language selection is currently broken. No time to investigate further though...