Update for /usr changes