Correct upstream issues