Fix subproject ids