Updates for changes to dependent stuff