Trying to fix upgrade woes