Adjust fixes for trusty