More reference updates to fix build server compatibility.