Fix code to work with the new lang settings