Bunch of Shipyard changes. See Commit list.