Trying to fix upgrade woes caused by language