Fix upstream ids