First pass of changes to support trusty.