Updates to work with Trusty Tahr